Code style and javadoc fixes