Various structural and formatting changes