Refactored start/stop