General clean up
Merge pull request #1 from bmneely/some-cleanup

General clean up