Add javadoc & bring fields in order