Removed some intermediate variables.