Cleanup (remove unused imports, more pep8 compatible)