Improved readability of notification code