refactored duplication
refactored duplication