BF: comment cleanup in demo