Updating versions and tidying up
Updating versions and tidying up