Refactored names for readability