PEP-8 style fixes, unused import removed