TW-28291 Annotations, javadoc, code cleanup