re-use some variables (minor change...)