More cleanup and typography