refactors SOQL_Query_Maker, more DRY
removes commented code"