Refactor a little bit of cell generation in worldgen