PEP8 cleanup, remove unused variables and imports. Thanks to slick666.