code review feedback

Auditors: blackmad