Cleanup around formatting and flow