Update style and minor tweaks.