More fine tuning of formats