Minor web service refactoring and fixes for lint issues flagged by Jenkins