That's they way I'd like to see it in the other PRs as well, good stuff! :)