more removing of allow(non_upper_case_globals)