Some cleanup and bump to 0.1.2