PEP8 fixes
Fixed imports