Code refactoring with just code