Removed variables in modules outside of classes for now