Legacy Code Refactoring