Refactor touch bindings