Formatting changes remove variables