squashing commits of cleanups and trailing spaces