Small refactor in gen with _fill_room