True, but I was attempting to avoid changing what was already done.

But yes, that looks better :)