Fix imports
Remove executable part of zss.compare
Random subset of pep8 tweaks