Fixed macro name
Removed useless `static`
TODO