removed unnessesary lines of code