refactored names for clarity