Made favorite variables local / consistent