Refactored according to PEP8  (as suggested by pylint)