yeah, lets do that, you're right, its nicer. I'll update the PR in a bit.