further style tweaks