PEP8-fix and removed unused module.