Removed one unneeded variable substitution