cosmetic tweaks -- doing a few things more idiomatically.