Fixup - remove whitespace, alphabetize, variables