Fix code review remarks