Address review comments around clearing, MACRO constants, and sample/