[AESH-244]
cleanups, javadoc, ++
Merge remote-tracking branch 'upstream/master' into AESH-245
Correcting formatting