A few style updates