Minor cleanup
Spike out a main