2 Little changes for code review