clean up; add quotes to variables;