removed unnecessary vars