Fixing multiple var, removing comment code