init: indentation and wait-for-stop on restart