Fixed things mentioned in the pull request comments