Refactoring: cleaned up Archipelago class