Cleanup:
- Group stuff
- Document
- Delete
- Improve