Minor cleanup in prep for v0.2.0