refactor for orgnization
Merge pull request #3 from philwilt/chap4

refactor for orgnization