Cleaned up global namespace.