Improved Comment Skipping

Consolidated the "skip comment" rules