Refactored duplication