Refactoring Athlete