Yes, I like your version better! Will update the pull request...