Minor tidying up for v0.1.1