Code cleanup for 0.2.0