Hero refactoring.