code review tidy of inessential tasks and start/stop more flexible