Minor code and javadoc improvements.