Minor refactoring
Binding functions moved to widje