Couple improvements in style