- Speed improvements
- Cleaning up