[cleanup] review comments