Cleanup to change some vars to vals.