(#1818) - Tidy alerts

![](http://i.imgur.com/xFsHwcn.png)
![](http://i.imgur.com/81KUPwy.png)
ping @nolanlawson