Tidy up.
Update version