YYF Comment Clean-up