Sorry I just now understood what you meant. I'll change it like you proposed. That should make thing considerably cleaner.