Address the issues from code review