Updated this PR with this suggestion :)