minor refactoring; curriculum completion