removed extra variable assignments