Minor accept controller cleanup