Removed unnecessary temporary variables