Alphabetize and clean up