3 Years Ago
Refactored a bit to remove code duplication