Did some comment cleaning and fixed misleading variable names