Whitespace and import fixes (PEP8)