mostly javadoc cleanup
code cleanup