Make into a package, add context manager to PingService