Pep8 fixes

Fixed all pep8 related errors, except for some comments that exceed the proposed line length