further clean-up of variable names