code quality: update use statements
Merge pull request #860 from xabbuh/code-quality-use-statements

code quality: update use statements