Fix pep8 complaints (line-length=120)