cleaned code
Merge pull request #20 from desicochrane/dec-10-refactor

cleaned code