Cleaned Up Whitespace

A replacement for the mess I made in #248.