Fix/Improve script header
Fix/improve scripts headers