Tidy up.
Tidy up and version update