Refactor professor saving to remove some code stink