convering to PEP8 names for a couple of functions