code review

Code review for Nate's PR232