remove commented lines, alphabetize classes