Minor refactoring on curriculum view