Code Review feedback

Auditors: nsanch, blackmad