[minor] A bit of code reviewing with Zoe