AI update

- part 2 of the "__ you AI!" series of updates
- cleaned up some existing code