Okay, that sounds good.  I'll do the refactoring tomorrow.  I think that you are right that it will improve readability.