Tidy this stuff up
Bump version