Clean the code + add Cave class