pylint suggestions: removed extra imports etc