Uniform indentation, removing trailing whitespace

There was lots of mixed tabs and spaces and odd indentation, etc. Just a bit of cleanup.