Reacting to code review on #40 - minor changes.