[COOK-3794] Fix notification

https://tickets.opscode.com/browse/COOK-3794

Also cleanup code and logic