style and markup refined a bit