move formatting into separate step for easier enabling/disabling and better parallelism