Small improvements according to the previous comments