SquadLogic: Refactor