Regex updated, output improved.