Cleanup + improve notifications