Minor cleanup for v0.1