Code cleanup; begin work on 0.2.0