cleanup
Simple variable renaming
Add some more agent types