Formatting update.
Updating for 2.2 with new variables + query hook
Minor formatting.