apply enebo's comments on loadService refactor.
Merge pull request #1809 from ratnikov/loadservice-enebo-comments

apply minor enebo's comments