Style and javadoc corrections.