* renamed variables and functions to match http://legacy.python.org/dev/peps/pep-0008/ convention