Made pep8 compliant