extracted csv generator class and removed queue hard coded references