I don't like this change, it makes code less readable for the sake of brevity. Please revert to the original form