continue refactoring (trees, roads)