2 Months Ago
Tidy up with an internal method to reduce duplication