Some cosmetic changes to the client file.