Changes based on code review comments