Cleanups in variable naming