Fix mismatching Course usage and refactor some spacing.