server: comments, cleanup