Merge pull request #5 from ddebrunner/master

Code cleanup.