Cool refactoring solution finished