Eliminate extra assignment