Cleanup parsing + Rename some macros