refactoring: rename variables to be more clear