Neater macro definition