Cleaning up bindings a bit