Merge pull request #22 from ScotterC/clean-up

Clean up.