cleaned up lambdas in code.  created GraphiteQuery data type to encapsulate query settings