@mjallday thanks your input. I just refectoried this pull request. have a look