Complete athlete actions and some refactoring