Adressing Code review notes