Small improvements in formatting