Structural changes
Varying structural and code formatting changes.