Scope cleanup in UI.  Comment cleanup in Enrollment.