made pep8 compatible, modified test to pass with new variable names