cleanup and added avg consumption to qself