Yeah this kind of grew organically and I forgot to simplify the logic.  Thanks for catching it.