AIEscort Cleanup - Fixed

Fixed spacing, removed unnecessary includes, fixed branch itself. 

The other pull requests were fine, it was just this one with the problem.