Excessive Vars: Made it less