Massage keywords into more machine-friendly format
More keyword massage