Address CR comments on comments
- Also clean up VB comment syntax

(cherry picked from commit 5a701f34413d0ec0323f3874c94a979562637c5f)