handler and cleanup
Merge pull request #81 from browles/master

(refactor) handler and cleanup