Code review small changes