Few more code review comments