prevent variable name clobbering.
formatting improvements.