I agree with all you are saying, I have updated the PR.