Typo, white-space, PEP8 and formatting fixes.