Partial code review
Merge pull request #1 from Orkin/master

Partial code review