performance refactoring present and typing notifications