Did some clean up before v0.2 release