Further spacing consistency update