incorporated notes from corey's code review
Merge pull request #82 from wolves-2014/implement-coreys-code-review

incorporated notes from corey's code review