Courses and email template tidy