Taking out some intermediate variables that do nothing.