Cleanup + bump to 0.0.6