moving towards pep-8 standards