Fixup spacing on styles globally, mildly optimize