Review and stylecheck edits