Eliminated Useles code and Changed name