Cleaning up whitespace issues, verbage, and order of rules