DRY: Remove replicated code