Changes from Naomi's code review