3 Years Ago
Tidied up callback code as per review