Clean up and bump to 0.0.2