cleanup and standarization of variables, quote everything
more standardization of formatting, and quote everything