Changes from code review comments