Tons of fixes to comply with the CLASS style document