Javadoc + coding convention fix