PEP8 compliance added