Cleaned up global namespace