- Removed unused macro
- Cosmetics
- Renamed variable