Small improvements in style [2]