Merge pull request #344 from GrahamCampbell/tweaks

Minor Optimizations
Merge pull request #343 from GrahamCampbell/use-fixes

Use Statement Fixes