(1) PEP8 standards, have been naming things so wrong for so long. (2) tiny refactor