Tidy up and bump version