Made some client asked for formatting changes