Made PEP8 compliant