I went for the simplest output to get the ordering correct. I'm happy if you want to change it for consistency but I think I prefer it this way. It does feel a bit repetitive tho.