Improve course container class