WIDGPT-56: Little more code cleanup