That is cleaner and more concise. I'll change it.