Excellent idea! Ok I'll apply such changes.
I appreciate you discuss with proposing alternatives solution instead of just criticize ;)
This is great!

Should I completely rebase the commit ?