Some refactoring in SimpleAppService