I think having them combined and relying on if statements was getting confusing especially if we want to add additional messages with different payloads (which will soon be the case).