Minor refactor rSPTdbd29ee20e1ccbf183b83f3c2ab9340025cc15d1