Final cleanup for v0.1.0