cleanup, plus alphabetize