refactoring and renaming for readability (next)