Cleanup
0.0.1
Minor cleanups