comment-engine: code cleanup