Tidy a bit of white space differences that Aaron introduced, remove logging.