Reformat #define's