Minor cleanup, add isRunning() method.