Added changes done doing the code review