[AESH-244]
cleanups, javadoc, ++