Task #59 @5m Refactoring.