Moved run helper script to separate file, cleanup