Small changes for code review