Code refactoring baby steps