Address pull request comments from @skoczen