Yes, much more succinct. I have updated it.