PEP8 related fixes