minor style, markup, cleanup