Refactor academy_tracker