Style changes

Bringing the code into pylint-compliance