bug fix, more pep8 compliant