Adapted the scripts to the code standard