Changes

Tons of formatting changes