Starting to rationalise config values and code repetition.