Review changes - spacing out function
Review changes - reducing down to 2 `replace` calls.