Refactor AI play some more