A little styling and rejigging