Minor cleanups, including reverting unnecessary whitespace changes,
changing order of imports, etc