took away unnecessary code