Removed temporary variables