Javadoc and style fixes