First round of AO cleanup
Merge pull request #55 from thefinestsieve/beta

First round of AO cleanup