Use statement cleanup
Merge pull request #343 from GrahamCampbell/use-fixes

Use Statement Fixes