https://bugs.eclipse.org/bugs/show_bug.cgi?id=383849 - minor refactoring
and cleanup and javadoc
3 files changed