cosmetic tidy-ups to standarise template typename naming and format a bit