Tidy up of Training app