fix typo, tidy cleanup macro