Nitpicky whitespace and ordering changes