Refactoring. Added constant for a notification key.