Fix formatting for client and server