Refactor legacy code for better maintainability