Cleaned up start/reset logic