Refactor table Bindings to Binding; improve code quality