amazing refactoring