Finished up

Make sure you watch how much whitespace you're adding to files. There's a lot of inconsistent whitespace in this file.