Extract badge_colour & with_suffix methods out into a separate lib file