refactoring + some new trainers
deletions