Upgrade and tidy up