Update code braces, extra-improve data management
Remove backward compatible is_main_query() check

We should be able to rely on is_main_query this many years later.

Or you should upgrade your WordPress install. :)
Merge pull request #6 from jeremyfelt/1.7.1-review

[PR] 1.7.1 review