- Refactoring and adding helpers
- Cleaning up running list