apply more code review feedback