some clean up work: clean-up
Merge pull request #13 from activeagency/clean-up

some clean up work: clean-up