Tidied up and normalised all web services