Rearrange bindings for clarity