Refactoring new code