Cosmetic changes in script