optimize use statements
Merge pull request #78 from basz/fix/cs

optimize use statements