Yeah, the reworked code looks less ugly to me as well. Thanks!