Clean up some whitespace

We had tabs in a couple files somehow, plus trailing spaces.