Legacy Code refactoring project