Use modules to remove globals