Changes due coding style
Update scripts for plugins