first refactoring
Variable name changed.
Method moved
Replace Temp with Query.
Comment out deleted