Minor changes for consistency

- And reordering to highlight duplication