Formatting changes and renaming confusing variables