refactored a couple things after discussion w TA