Refactor athlete/index