Level generation cleanup a bit. Still WIP