Reduced line lengths to be compliant with pep8