Feature/pretty

@nilstgmd please pull
---
@Age15990 @Desi252 FYI
Implementation details is class name.

I would actually name the query on their semantic. If the to get a single record would change, e.g. `findAndModify` you not have to rename the queries.