[TASK] Updated to the comments from the pullrequest #1