Probably not a bad idea... I'm not sure it's gotten quite that out of hand yet, but wouldn't be opposed.  Maybe next time someone is in this code?