Since some people disapprove of white space cleanups mixed in regular commits