a few formatting tweaks, review w/evh