Cleaning up the global scope