You asked for a BETTER solution, I quote ... and come up with a better solution.
Paul has given you an alternative which falls firmly into my statement ... Any 'improvements' would be cosmetic, or worse, unclear. No criticism of Paul, his offering or trying to give you alternatives, but if you think that is better, then we clearly live in different worlds. Part of gathering knowledge is to acknowledge that if it ain't broke, don't fix it.
I will sign-off now, with nothing more to add.