Javadoc and style cleanups