Improve start/stop script