clean up and bump to v0.0.4