memory optimization + cleaning

- free 130 bytes of ram (you never know)
- revised defines