[WIDGPT-52] Updates based on code review comments