Upgrade ag
Snippet cleanup