Cleanup tweaks in variables.