Tune formatting a touch more