Cleaning up the new script