Fixed comments :
- Moved builder code to bottom of domain classes
- Simplified builders
- Used PagedIterable instead of FluentIterable