cleanup

- make methods out of responsibilities
- eager load translations
- more testing