All your comments are really better than my. But how to deal with that now?
Should I update my local files and make a new PR?

Remember, is my first one ;)