Cleanup
Tentatively fixed #4.
Make minor aesthetic changes.