Optimized Variables + editorial changes