Remove too many var statements error