serv task refactoring