Code Review feedback

Auditors: blackmad