delete queue, add classes ,rename variables