Savanna refactoring