More using cleanup
Fix a nit
Merge pull request #322 from peternewman/trivial-fixes

More using cleanup