various style tweaks
uncommitted changes