clean up and try to stay out of quoting hell at least in the simple cases