More formatting changes, continuing to document the code