Style, performance tweaks.