~ data binding refactoring