Cleanup formatting for next submission