Formatting on client, finishing up