[REFAC] Remove duplicated Code
[TASK] Minor changes