eliminated unecessary variables