- Removed some unnecessary includes
- Formatting