Query -> Q; extra notes
notes and whitespace
renaming, refactoring and more notes
more renaming
more notes