Code review feedback

Auditors: blackmad