Minor cleanups
v0.2.0