Clean up notification logic and stlyes.