Code review comments
Merge pull request #1 from sul4bh/master

Code review comments