low hanging refactoring fruit