Fixing issues and comment from code review