cleanup the input mess, part2