edited unnecessary code