Remove minor circular dependency
Refactor team selection workflow into a single method
Refactor data initialization for neutral ground match calculation
Remove redundancy in servlet code