Minor fixes to rainbow paren
Minor cleanup / reorg