Minor re-factoring [#62059530]