Clean up and upgrade
Small fix