Cleanup to get variables working.