Just synching up some random cleanup formatting changes.