Hard refactoring