minor style tweaks take 2