Create separate run script, add a few comment, clean up a little