Lots of code cleanup

See title.
More cleanup

Readability greatly improved. Other flaws in design made apparent. Next
step is to create a class to represent the state of simulation at any
given time.
Started simulation state class

Had to commit this to sync previous commits done when I didn't have
internet.