Minor cleanups and more alphabetizing

Change-Id: I14b5bbc378e3da46735b9b9a1d0b6706f5fa98a1