a few style changes and simplifications
additional style improvements
invalid TODO removed
Merge pull request #1341 from jerrinot/styles

merging. added issue #1456 for QueryResultSet refactoring