Close var element properly
Merge branch 'comb-like-terms-fix'