Agreed! Let's simplify this part in another pull request. I just want to keep pull requests as minimal as possible. thanks