Code style and javadoc improvements.