SwarmUtil refactoring