10 Months Ago
Refactored a bit to remove code duplication