This code is less readable than previous, I would leave previous one.