Minor PEP8 cleanup.
Fixup windows newlines.
remove a few unused imports