remove extraneous comments and shorten lines
tweak variable names