PEP8

Lines shortened & other pep8 fixes