web service is now cleaned up and unit tested