PEP8 modifications