refactoring (renamed some identifiers)