#30

Main cleaned up a little.