Adressing code review comments