Many style tweaks.