Fixed long lines and some more pep8 errors.