Some refactorings in course detail.