Refactoring service status