Refactored course paper