Cleaned up bindings