Fixing issues noted by peterbe in code review
Merge pull request #7 from mozilla/peterbe-pr-5-feedback

Fixing issues noted by peterbe in code review