I expect that @Velo-Ninja or one of the other experts will look at it and offer improvements and fixes…
Monitoring your post → maybe 
Improvements? → First wait for results. If there is a solution at the end and it works for the post-opener → no improvements needed .
A coder needs time to get a good solution → more time → more quality code.
Here an example…
…only who works on his own codes → will also get desired solution.
And btw, not every suggested improvement → is a MUST 
. Every coder should also have some kind of his own coding style.
And since i know you are also active on the editor-X-Forum, i think you are experienced enough, to get a solution here. But i will follow the process here