Refactored according to PEP8