Added script-folder + commenting/indenting