code clean up
Merge pull request #18 from ljwolford/cleanup

code clean up