Clean up the code quite a lot, using lines as borders now, new CaveFactory