minor refactoring of transfer controller