Generator : More cleaning