Cleaning it up for the release