Fixed enum names, javadoc column limits and blank line