Updated according to PEP8 style guide