another duplicate var binding, and trailing whitespace cleanup