Some minor javadoc issues
Fixed checkstyle issues