Cosmetics on the script code