Addressed review comments

This pull request addresses my own review comments for #241 :)