Cleaned up notification handling