PEP formatting and variable naming changes
removed unneeded function arguments