Tidy up for pylint
Fix import
Tidy for pylint