Very good suggestion, this will clean things up quite a bit.