More clean up

I want to get the code in the minimum state where things will work.

See #59.