cleaning, simplify regex, chg var name, limit long output lines