removed unnecessary variable assignments