Remove unnecessary branch/temp variable
Fine tuned the order of adding request variables.