improve variable naming as of pull req #1