Cleaning up code

Went through and cleaned up the appearance of the code. Just finalizing
touches.