Cleanup more janky formatting