Refactoring PayTo selection