Removed extreneous commented blocks
Formatted files
Added metrics to queries