cleanup whitespace, adopt into PEP8