Minor: WS cleanup + other formatting changes.