Improve comments in server module