More reactive trailing whitespace highlight
Comment and reorganize