Good point.
I simplified that block a little further.