move Tenant class define_method calls out of private