Cleaned global scope