Quote variables.  Remove unused variable