Fix PEP8 and typo

Basic PEP8 rework and fix typo in the manual.