Fix PEP8 for [core] issue #125

Few lines are still greater than 80 characters, otherwise all pep8 tests passed.

Still the code can be homogenized.