Cosmetic fixes to conform to CLASS (RFC21)
Minor code cleanups
Updated to refer to CLASS spec for style