Removing and restructuring comment.id checks