Refactor legacy code for maintainability