PEP8 and related changes