Modest clean up of web service (more to come)