Code Review Feedback

Auditors: nsanch, blackmad