- Removed unused headers
- Using push(op, op1) when possible