Client: Some minor addition to style.
Server: Ccomments cleanup