style athlete edit form
clean up helpers
Merge branch 'master' of https://github.com/alexqguo/octf

clean up helpers