cleanup and convert _ to $