Slighting refactoring of new code