[#54623416] Minute code refactor.