Tweaks on variables and imports