- Removed unused header
- Minor optimization