pep8 violations removal

Try to remove as much as possible obvious pep8 violations without sacrificing readibility.