[master] Simplify
[master] Separate words
[master] Begin define core macroses