cleanup
(cleanup) General cleanup
Merge pull request #4 from marcwilhite/canary

(Cleanup) Canary - General Cleanup