Yes, your code is shorter but more unclear. Even if it looks a bit copy-pasty, I insist to leave this as it is.