Formatting changes to client-server