Standardizing variable names, clean up some method names, removing trim.