refactoring: changed variable and ID names