refactor notification text and subject