Code cleanup that I intended to do in my last pull request
Merge pull request #415 from nunit/issue-cleanup

Code cleanup that I intended to do in my last pull request