refined warnings issued by the macro and cosmetic changes