Cleanup notifications class
Fix #71