Cleaning up the code.

Cleaning up some code. Not on my computer right now.