Code review comments
Merge pull request #11 from Clever/review-feedback

Review feedback