- Cleanup + small fix