removed unneccesary assingments