some tweaks on style