Cleaned up notify