minor refactoring
web service