Cleanup and minor javadoc fixes