code cleanup for 0.1 release