clieaning up watcher code
add restart handler to process
add restart handler to watcher