Fixed macro formatting