Final edits before moving to inference