code review

Code review for Nate's PR232
@NikitaAvvakumov did you say there was an additional unless you wanted adding back in?