LocalCourseStorage refactoring