bringing code in better sync with related documentation