59 Days Ago
Refactored a bit to remove code duplication