Refine exclusion check for grad courses so two-digit courses are permitted
Readability improvements