Removed unused import.
Some clean-up (pep8 stuff).