*Should* be all pep-8 compliant now