simplify a couple things
Merge pull request #3 from ryankshaw/test

simplify a couple things