refactoring, use Xtend lambdas now for better structure
xtend-maven-plugin must be version 2.4.1, the older 2.3.1 does not compile the new code
minor fixes to make output prior and later identical
Merge branch 'lambda-refactoring' into develop