Version number bump
Tidy up