Format per coding standard
Update javadoc
Update javadoc
Extract literals to static fields