small refactor with some variable names