Some cleanup v0.2