some refactoring during the training.. he he he