Clean up code slightly, and presentation of code quite a bit.