tweaks: reshuffle some code, and rename a variable
1 file changed