Wouldn't this be simpler?

Er, yes, yes it would ;)

mental note to self - refactor

_________
broquaint