DELTASPIKE-288 improved javadoc and minor cleanup