My fault! I agree what you proposed is easier to read. Done