A few style changes.