Refactoring to the max