Improve comment.
Move things for clarity.
Improve naming in the query models project.