Code and javadoc clean-up