PEP8 manual style fixes