Cleaning up how mutators are stored in the global namespace