SN-59 Refactor