Tidy up notification logging