small clean up in preperation of v0.1