More refactoring on alliance view