Good point. I only have the ugly code in a few places so I debated whether doing something like this would be worth it or not. It probably is.