I have changed it to your suggestion.  I do like this solution more.