Maze generation 2

Cleanup.