eliminate var name reuse
minor cleanups using 1.1.5 features