Some changes after reviewing
Merge pull request #1 from ghoneycutt/review

Some changes after reviewing