Cleaned up the code.

I forgot to do that in my last pull request.