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

More using cleanup
Even more using cleanup
Even more using cleanup
Merge pull request #323 from peternewman/trivial-fixes

More using cleanup
Even even more using cleanup
Merge pull request #324 from peternewman/trivial-fixes

Even even more using cleanup