Adapted to PEP8

A number of files did not conform tot PEP8, at least according to
the output of the pep8 command.