[#61502574] Small code refactor