Clean up notification stuff a bit