Changes from code review feedback