Clear up variables and quoting