various style tweaks
various style tweaks