code cleaning, took out unnecessary code