various iterative style tweaks