Things

- Code cleanup
- Updated gems
- Eager loading