Changes to comply with PEP8