Formatting changes and variable scope