Some aesthetic changes, eg, line shortening