improving should see and wait conventions