Investigating 5 relevant query shapes
Formatting and killing unused case classes