Resolve the comments for code review