Style and Javadoc improvements