Tidy up locations
Fix isRunning check