Refactor
I refactored and cleaned up the source code using Java 8 features. I couldn't test it in context of a training. Before using it in a public training you should do a dry run. May be it is a good idea to come to gather to present the changes and answer questions!?