performance and style tweaks