refactor - trainer simplified