Cleaned up service handling.