address @sjcorbett review comments