Smarter use of Atom classes, Beautify notification