Refactoring + s2t.