tidying up type-setting