Move constants from Javascript class to where they're used.
Comment cleanup.
More compact listing of fields by putting annotation on same line as declaration.