Code cleanup for 0.1.0 release