- Renamed some macros and added clever_get_this
- Cosmetics
- Cosmetics