Tidy up of Mashery caller class