Misc cleanup. Mostly just removing unnecessary qualifiers and fixing spacing.