Modified unused variables and undeclared variables