Minor improvements: comments, cleaning