Improve error case definitions
Highlight as error: `%` and `@` that is surrounded by spaces