style update and tweaks