Slight changes based on @jtratner's feedback (#4524)