clearing up variable duplication 

as discussed https://github.com/discourse/discourse/pull/2174