More whitespace cleanup

Some trailing spaces, tabs instead of spaces.