Comments seemed to have quieted down on pull request. Pushing another revision addressing current comments.