Made changes per @hseeberger comments on the original pull request