fixing macro style