Transfer refactor