PEP8 and style fixes