cleanup common, alphabetize before i go crazy