Updated comments for readability

Just comment cleanup.
No functional change at all.
Factor in whenever.