Comments, notes and quit old-style formatting