PEP8/style fixes