Changes from code review notes