Solve pep8 problems
More pythonic names for variables